Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
172,025 Commits 3 Branches 0 Tags
a6670282071fb29fe7ace8e7f55c446c05b718bf
Commit Graph

43611 Commits

Author SHA1 Message Date
John Spurlock
a667028207 am 96171f08: Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev automerge: 0bdefb9 automerge: 513f260 
* commit '96171f08c121a7d15a6a8cbdb28e49c917418c1f':
  Zen: Create a new exit condition for "next alarm".
 2014-11-05 18:47:27 +00:00
John Spurlock
96171f08c1 Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev automerge: 0bdefb9 
automerge: 513f260

* commit '513f26020095c409aa3e828c98485ed20aa9eaa9':
  Zen: Create a new exit condition for "next alarm".
 2014-11-05 15:42:30 +00:00
John Spurlock
0bdefb9953 Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev 2014-11-05 14:47:20 +00:00
John Spurlock
37bc92cc23 Zen: Create a new exit condition for "next alarm". 
- If the user's next alarm is in the next 12 hrs, provide
this as an exit condition trigger for leaving none/priority.
- Don't display the next alarm condition when downtime is active.
- When the next-alarm exit condition is active, follow changes
to the next alarm, assuming it remains within the 12-hr window.
- Tweak the downtime condition strings to be consistent.

Bug: 16373455
Change-Id: I4020b91d323dead998e62d655132eca07438b148
 2014-11-05 08:46:01 -05:00
Jungshik Jang
4acb768ce8 am af45240b: am 9ae3fe48: am 09035486: Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev 
* commit 'af45240bf06faa649cc60be560159de0d246b6a9':
  Add recorder address to all recording listerner apis.
 2014-11-05 06:33:33 +00:00
Jungshik Jang
af45240bf0 am 9ae3fe48: am 09035486: Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev 
* commit '9ae3fe48d912d9135684d435d282fa2bb4929a2e':
  Add recorder address to all recording listerner apis.
 2014-11-05 06:29:24 +00:00
Jungshik Jang
090354861a Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev 2014-11-05 05:54:15 +00:00
Alan Viverette
8df94b5659 am b6416716: am 6a98dde8: am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev 
* commit 'b6416716ad875a800c982dda77bafe910f9ed2d6':
  Use default token instead of wrapped window manager
 2014-11-05 05:03:59 +00:00
Alan Viverette
b6416716ad am 6a98dde8: am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev 
* commit '6a98dde8dffac83283850afaec4400db9146a3e5':
  Use default token instead of wrapped window manager
 2014-11-05 04:56:40 +00:00
Alan Viverette
9342b049b9 Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev 2014-11-05 04:44:22 +00:00
Jungshik Jang
326aef0c94 Add recorder address to all recording listerner apis. 
It enables to recognize which recorder reports record status.

Bug: 18248734
Change-Id: I248ad77212ce584dc16863cbe00639e7ac3c184a
 2014-11-05 13:32:52 +09:00
Alan Viverette
838b7b6d05 am e48b397f: am 405165b6: am a446195b: Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev 
* commit 'e48b397f93fb7ed4b7520d72368c2b4472f7cf5f':
  Fix hasSurfaceInsets check when creating hardware renderer
 2014-11-05 04:18:26 +00:00
Alan Viverette
a47e3e0572 am 69eb010b: am a77e349a: am 9c95264e: Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev 
* commit '69eb010b1e2bc002b020b2722cc42447383bb5d3':
  Abort accessibility node prefetch if parent node is null
 2014-11-05 04:18:16 +00:00
Alan Viverette
e48b397f93 am 405165b6: am a446195b: Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev 
* commit '405165b6cd749d0281bb1daa13bdf0a8f38112d9':
  Fix hasSurfaceInsets check when creating hardware renderer
 2014-11-05 04:06:21 +00:00
Alan Viverette
69eb010b1e am a77e349a: am 9c95264e: Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev 
* commit 'a77e349a3609833c55ee3b8b80fc5eef5fac4f1a':
  Abort accessibility node prefetch if parent node is null
 2014-11-05 04:05:58 +00:00
Alan Viverette
a446195b0d Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev 2014-11-05 02:09:30 +00:00
Alan Viverette
9c95264e84 Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev 2014-11-05 01:41:28 +00:00
Alan Viverette
d2fa514391 Use default token instead of wrapped window manager 
BUG: 18248602
Change-Id: Id7f06c896dc71db3564fa21d3704222557613035
 2014-11-04 17:40:29 -08:00
Alan Viverette
2cd23e6b9d Fix hasSurfaceInsets check when creating hardware renderer 
BUG: 17729606
Change-Id: I8c7092428b790e0ff3bbf84b64ba385ef2b2f521
 2014-11-04 17:04:02 -08:00
Alan Viverette
f74a4d7ddc am ffa031bb: am e9596818: am aa33a487: Merge "Always update date picker position after change in range" into lmp-mr1-dev 
* commit 'ffa031bbada658fd33c137e381e219ac248d29fe':
  Always update date picker position after change in range
 2014-11-05 00:17:32 +00:00
Alan Viverette
ffa031bbad am e9596818: am aa33a487: Merge "Always update date picker position after change in range" into lmp-mr1-dev 
* commit 'e9596818e58d912323132c63185719f1e69cbbd5':
  Always update date picker position after change in range
 2014-11-05 00:11:12 +00:00
Alan Viverette
aa33a487c8 Merge "Always update date picker position after change in range" into lmp-mr1-dev 2014-11-05 00:00:52 +00:00
Alan Viverette
84feea1185 Abort accessibility node prefetch if parent node is null 
BUG: 18004444
Change-Id: I80757daeb6b381947c4f3abbd762711cff2a978c
 2014-11-04 15:59:55 -08:00
Tom Hudson
a5545d24c7 Merge "Remove status return from all uirenderer::Renderer functions" 2014-11-04 21:05:29 +00:00
Tom Hudson
107843de45 Remove status return from all uirenderer::Renderer functions 
This moves the interface closer to android::Canvas. The only use of
return values was in the OpenGLRenderer subclass; that is replaced
with an internal dirty flag: returned from finish(), checked by
CanvasContext.

This is part of a series of CLs to refactor the Graphics JNI bindings.

BUG:15672762
R=djsollen@google.com,ccraik@google.com

Change-Id: Ifd533eb8839a254b0d3a5d04fc5a2905afdfc89e
 2014-11-04 15:49:44 -05:00
Mike Lockwood
2155e0c83f Merge "Add BluetoothDevice field to BluetoothHeadsetClientCall" 2014-11-04 20:01:38 +00:00
Alan Viverette
12a72ada52 am 954f2567: am 3fff156e: am 18b055e1: Merge "Pass surface insets from window attributes rather than params" into lmp-mr1-dev 
* commit '954f2567f90f1fa8b3d3d7d0c426ebd35494e182':
  Pass surface insets from window attributes rather than params
 2014-11-04 19:45:08 +00:00
Alan Viverette
954f2567f9 am 3fff156e: am 18b055e1: Merge "Pass surface insets from window attributes rather than params" into lmp-mr1-dev 
* commit '3fff156e13341b0bf818f83d2bb0e9404285dd0c':
  Pass surface insets from window attributes rather than params
 2014-11-04 19:40:08 +00:00
Mike Lockwood
ddbfc9ada1 Add BluetoothDevice field to BluetoothHeadsetClientCall 
Change-Id: I9bc70eb289fdfb64e315e3508ddeef1cb009cc54
 2014-11-04 11:37:24 -08:00
Alan Viverette
18b055e106 Merge "Pass surface insets from window attributes rather than params" into lmp-mr1-dev 2014-11-04 19:30:34 +00:00
Alan Viverette
93cad8c4d4 Pass surface insets from window attributes rather than params 
Params only gets set in certain situations, whereas the actual window
attributes always contain the correct surface insets.

BUG: 18214798
Change-Id: Ib5236ccf3f120b26c5abc8671bf29cb3dc269186
 2014-11-04 11:27:19 -08:00
Wale Ogunwale
a9868fbd7b am 2749a5e6: am e54553c8: am d54b578e: Fix issue #17305377: Don\'t kill process if it still has tasks. 
* commit '2749a5e6cec41cbdc019134db6fc96e5283db9b4':
  Fix issue #17305377: Don't kill process if it still has tasks.
 2014-11-04 19:22:25 +00:00
Wale Ogunwale
2749a5e6ce am e54553c8: am d54b578e: Fix issue #17305377: Don\'t kill process if it still has tasks. 
* commit 'e54553c841f3ca1ebcb822e8b9ab6a412e7bd895':
  Fix issue #17305377: Don't kill process if it still has tasks.
 2014-11-04 19:14:49 +00:00
Wale Ogunwale
d54b578e47 Fix issue #17305377: Don't kill process if it still has tasks. 
We previously killed a process when one of its task was
swiped away in the recents UI. This had negative performance
implications for apps with multiple tasks in recents. Now we
will only kill the process if there are no more tasks associated
with it.

Changed also removes the need for the
ActivityManager.REMOVE_TASK_KILL_PROCESS since ActivityManager
will now only kill a task process if it process has no out
standing tasks.

Bug: 17305377
Change-Id: Ibc39bb328d13c7eab05c04798c2f14887923d9d4
 2014-11-04 10:59:31 -08:00
Griff Hazen
f7936df688 am 472b990a: am 07e8b2fb: am 9c95015b: Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev 
* commit '472b990ae11f4ae4c16d90cbb02e9efa868db382':
  Improve support for the barcode-on-screen use case for wearables.
 2014-11-04 15:37:00 +00:00
Griff Hazen
472b990ae1 am 07e8b2fb: am 9c95015b: Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev 
* commit '07e8b2fb7409f0893d13a6cfb4687ba70b220e91':
  Improve support for the barcode-on-screen use case for wearables.
 2014-11-04 15:33:17 +00:00
Griff Hazen
9c95015b0c Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev 2014-11-04 15:23:21 +00:00
Nicolas Prevot
f6319c7e78 am b01a483e: am 7ca8674f: am ac7774e8: Merge "Do not fix uris inside the system." into lmp-mr1-dev 
* commit 'b01a483e64a1beab6eb680c82ab472ed159e394d':
  Do not fix uris inside the system.
 2014-11-04 10:59:40 +00:00
Nicolas Prevot
b01a483e64 am 7ca8674f: am ac7774e8: Merge "Do not fix uris inside the system." into lmp-mr1-dev 
* commit '7ca8674f66047c409031f3c5e4590c97c62f910d':
  Do not fix uris inside the system.
 2014-11-04 10:55:26 +00:00
Nicolas Prevot
ac7774e8c1 Merge "Do not fix uris inside the system." into lmp-mr1-dev 2014-11-04 10:47:25 +00:00
Narayan Kamath
f47a6db44b am f2196a6e: am 6220810b: am 78a3b7d5: Merge "Remove deprecated DateFormat APIs." into lmp-mr1-dev 
* commit 'f2196a6ed5988f87d0e04cc30f0f82f7ea431095':
  Remove deprecated DateFormat APIs.
 2014-11-04 10:16:22 +00:00
Narayan Kamath
f2196a6ed5 am 6220810b: am 78a3b7d5: Merge "Remove deprecated DateFormat APIs." into lmp-mr1-dev 
* commit '6220810b8167deee7bf2577f5136736473cbea1c':
  Remove deprecated DateFormat APIs.
 2014-11-04 10:08:53 +00:00
Narayan Kamath
78a3b7d5af Merge "Remove deprecated DateFormat APIs." into lmp-mr1-dev 2014-11-04 09:48:19 +00:00
Deepanshu Gupta
0ad1eb3349 am 837e65be: am a3698098: am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed automerge: 5ad0763 
* commit '837e65be0d7259bdc122c19676f9ad0b711b000f':
  Use the right layout for inflating Action Bar.
 2014-11-04 02:59:26 +00:00
Deepanshu Gupta
837e65be0d am a3698098: am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed automerge: 5ad0763 
* commit 'a36980980886a645627542a7bcabf0d718ea79c9':
  Use the right layout for inflating Action Bar.
 2014-11-04 02:50:10 +00:00
Alan Viverette
5ecbfeb38b Always update date picker position after change in range 
BUG: 18204507
Change-Id: Id3ae11cdb68f60901a3145ebd93f3acbbccd71d2
 2014-11-03 18:31:36 -08:00
Dianne Hackborn
41ca024387 am 726715e1: am e6fa3f44: am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev 
* commit '726715e1138d880656a13014d447a14b3998b132':
  Few more small meminfo improvements.
 2014-11-04 02:28:18 +00:00
Dianne Hackborn
726715e113 am e6fa3f44: am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev 
* commit 'e6fa3f44652fd9e23ce64f39bb43458fa4abd60a':
  Few more small meminfo improvements.
 2014-11-04 02:21:11 +00:00
Deepanshu Gupta
5ad076396c am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed 
* commit 'cd5f3bab37ef1dc041489f53f565416d295916d9':
  Use the right layout for inflating Action Bar.
 2014-11-04 01:08:23 +00:00
Deepanshu Gupta
cd5f3bab37 Merge "Use the right layout for inflating Action Bar." into lmp-dev 
automerge: 84a89ed

* commit '84a89ed0f56d4c35cde5a1451a22a6edb59db06a':
  Use the right layout for inflating Action Bar.
 2014-11-04 00:49:43 +00:00