OSDN Git Service
Pankaj Kanwar [Fri, 25 Sep 2015 18:59:11 +0000 (18:59 +0000)]
am
1e595bc2: am
52762ce8: am
f99986ee: am
65bfe1ca: Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev
* commit '
1e595bc225a4d2f1a9c8e59a2047bee33dd79439':
AudioService: cleanup sco audio mode upon disconnection.
Baligh Uddin [Fri, 25 Sep 2015 18:59:04 +0000 (18:59 +0000)]
am
252044e5: (-s ours) am
8403b9b7: (-s ours) am
437ee52a: (-s ours) am
2f09d2a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
252044e5e067367ac5cd1c75afcb2fcafeedde64':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 18:58:57 +0000 (18:58 +0000)]
am
e8b72edb: (-s ours) am
b4f7abbd: (-s ours) am
56c2f8ee: (-s ours) am
4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
e8b72edb1878aceeaabe13d3cc1b68eb81e8cc03':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 18:58:46 +0000 (18:58 +0000)]
am
58bed419: (-s ours) am
c266a512: (-s ours) am
6a39ee4d: (-s ours) am
9db221c8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
58bed419ad0572e051560509ebacab5e04b8b0f1':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 18:58:39 +0000 (18:58 +0000)]
am
2b3f2f45: (-s ours) am
fdfd01be: (-s ours) am
683db030: (-s ours) am
9b1c6f77: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
2b3f2f45098dad06f0044a6e5a1a83f71ed89018':
Import translations. DO NOT MERGE
Jorim Jaggi [Fri, 25 Sep 2015 18:54:05 +0000 (11:54 -0700)]
resolved conflicts for
c594e935 to master
Change-Id: Ifaf8c6c2b80e5284e027278f5ff0437202439cf0
Michael Lentine [Fri, 25 Sep 2015 18:20:29 +0000 (18:20 +0000)]
am
561f697e: am
a86465d7: am
8c743655: am
cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev
* commit '
561f697e4b8527cc674f8ada5f82952c53760049':
Revert "Dismiss color fade when it is no longer used."
Pankaj Kanwar [Fri, 25 Sep 2015 18:08:59 +0000 (18:08 +0000)]
am
52762ce8: am
f99986ee: am
65bfe1ca: Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev
* commit '
52762ce874200ad2fdbe24fa83ebf8ef6cbf08a4':
AudioService: cleanup sco audio mode upon disconnection.
Baligh Uddin [Fri, 25 Sep 2015 18:08:32 +0000 (18:08 +0000)]
am
8403b9b7: (-s ours) am
437ee52a: (-s ours) am
2f09d2a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
8403b9b7262527a27c7f77901ba4bb7d52a5c301':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 18:08:26 +0000 (18:08 +0000)]
am
b4f7abbd: (-s ours) am
56c2f8ee: (-s ours) am
4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
b4f7abbdaedafd3ec1bed152d74f0bdfaa96f53c':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 18:08:20 +0000 (18:08 +0000)]
am
c266a512: (-s ours) am
6a39ee4d: (-s ours) am
9db221c8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
c266a512cc4d4d844d152ad0ea8086966ee26dc9':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 18:08:14 +0000 (18:08 +0000)]
am
fdfd01be: (-s ours) am
683db030: (-s ours) am
9b1c6f77: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
fdfd01bef34ada326ff502f327e4387b8b14aa81':
Import translations. DO NOT MERGE
Jorim Jaggi [Fri, 25 Sep 2015 18:07:52 +0000 (18:07 +0000)]
am
f9f9999d: am
b7b9b31f: am
ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
* commit '
f9f9999d3245dffc8463a1f3f5f74dc900aa0196':
Deliver camera launch source for analytics
Michael Lentine [Fri, 25 Sep 2015 18:07:41 +0000 (18:07 +0000)]
am
a86465d7: am
8c743655: am
cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev
* commit '
a86465d7af8c8995210166954ec42624560bf86e':
Revert "Dismiss color fade when it is no longer used."
Wale Ogunwale [Fri, 25 Sep 2015 17:09:04 +0000 (17:09 +0000)]
Merge "Revert "Fix leaking the first activity while preserving windows.""
Wale Ogunwale [Fri, 25 Sep 2015 15:27:47 +0000 (08:27 -0700)]
Revert "Fix leaking the first activity while preserving windows."
This reverts commit
640a3909a33c5688f7752e5db6f7c6b23801300c.
Bug:
24293179
Change-Id: I9819f85d96bee240544beee9583b070c751cb9fc
Ben Kwa [Fri, 25 Sep 2015 14:58:42 +0000 (14:58 +0000)]
Merge "Activate selection mode when selecting via mouse."
Ben Kwa [Fri, 25 Sep 2015 14:47:56 +0000 (07:47 -0700)]
Activate selection mode when selecting via mouse.
Modify the MultiSelectManager so that toggling selection on an item
notifies listeners of selection changes, if necessary. This fixes a bug
where notifySelectionChanged wasn't getting called when the selection
changed.
BUG=
23944862
Change-Id: I3aef41cc92c560dc15bdc0fe310c340bdb3005f6
Wale Ogunwale [Fri, 25 Sep 2015 14:39:42 +0000 (14:39 +0000)]
Merge "Batch ACTION_MOVE events to vsync boundries when resizing task"
Abodunrinwa Toki [Tue, 22 Sep 2015 19:31:21 +0000 (20:31 +0100)]
Add more TextView selection (by touch) tests.
This change adds simple tests for:
- longpress and drag to select
- double-tap and drag to select
Bug:
24102650
Change-Id: I8614c8ec430dfc204159a03be409a2361cd7d844
Steve McKay [Fri, 25 Sep 2015 04:59:31 +0000 (04:59 +0000)]
Merge "Move State to a separate file."
Pankaj Kanwar [Fri, 25 Sep 2015 04:51:38 +0000 (04:51 +0000)]
am
f99986ee: am
65bfe1ca: Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev
* commit '
f99986eec6a263e74833d26dc8dcb107b15a9c04':
AudioService: cleanup sco audio mode upon disconnection.
Pankaj Kanwar [Fri, 25 Sep 2015 04:45:52 +0000 (04:45 +0000)]
am
65bfe1ca: Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev
* commit '
65bfe1cac3297d3d4463db753c0397f28c872637':
AudioService: cleanup sco audio mode upon disconnection.
Pankaj Kanwar [Fri, 25 Sep 2015 04:40:23 +0000 (04:40 +0000)]
Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 03:11:40 +0000 (03:11 +0000)]
am
437ee52a: (-s ours) am
2f09d2a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
437ee52a65e609ffce91aff8eff438ebc73d9105':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 03:11:34 +0000 (03:11 +0000)]
am
56c2f8ee: (-s ours) am
4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
56c2f8eefb7100ddc8850ccf744a7bc55e8d295d':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 03:11:26 +0000 (03:11 +0000)]
am
6a39ee4d: (-s ours) am
9db221c8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
6a39ee4db5f81795cbbfce0c2a864d619e860d88':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 03:11:16 +0000 (03:11 +0000)]
am
683db030: (-s ours) am
9b1c6f77: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
683db0306cfd756ff96fabbd0de07fa8b0184483':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 03:05:16 +0000 (03:05 +0000)]
am
2f09d2a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
2f09d2a999edfba173771ab020b87eca7ec7ef26':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 03:05:12 +0000 (03:05 +0000)]
am
4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
4ee34138c03dee1fd248046b135d9b4bcd84efdd':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 03:05:08 +0000 (03:05 +0000)]
am
9db221c8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
9db221c88c678419b1c6ac7cd8223b37cd2a43a4':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 03:05:04 +0000 (03:05 +0000)]
am
9b1c6f77: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
9b1c6f7781fba239c1636a418a9678c8b3e53896':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 02:58:40 +0000 (02:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 02:57:21 +0000 (02:57 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 02:56:40 +0000 (02:56 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 02:56:35 +0000 (02:56 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 02:36:51 +0000 (19:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iac1fe89a00d3f4e30b20e8f07c48a0845ce41d81
Auto-generated-cl: translation import
Eric Laurent [Fri, 25 Sep 2015 01:41:48 +0000 (18:41 -0700)]
AudioService: cleanup sco audio mode upon disconnection.
Clean up SCO forced usage and A2DP suspend state upon
SCO device or profile disconnection.
This is in case the Bluetooth Headset service does not
do it.
Bug:
24316765.
Change-Id: Ifc0305607c186be49b2eb42b7868647292e56137
Baligh Uddin [Fri, 25 Sep 2015 01:40:38 +0000 (18:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I50eeba5466bb054212dc51f8a8d1b5b76f56a31d
Auto-generated-cl: translation import
Jorim Jaggi [Fri, 25 Sep 2015 01:38:07 +0000 (01:38 +0000)]
am
b7b9b31f: am
ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
* commit '
b7b9b31f6969dc48174757ec236622f8d49222d0':
Deliver camera launch source for analytics
Jorim Jaggi [Fri, 25 Sep 2015 01:30:43 +0000 (01:30 +0000)]
am
ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
* commit '
ad26dc5f15d6ac13741ad8724c25ef8c58e73e81':
Deliver camera launch source for analytics
Jorim Jaggi [Fri, 25 Sep 2015 01:27:05 +0000 (01:27 +0000)]
Merge "Deliver camera launch source for analytics" into mnc-dr-dev
Baligh Uddin [Fri, 25 Sep 2015 01:12:20 +0000 (18:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I45388638f08ea212ddb1f15716a4020c3abc761c
Auto-generated-cl: translation import
Baligh Uddin [Fri, 25 Sep 2015 01:10:14 +0000 (18:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iebbf559a27c2c55ec7f172ad7e6592e86452edff
Auto-generated-cl: translation import
Michael Lentine [Fri, 25 Sep 2015 00:48:02 +0000 (00:48 +0000)]
am
8c743655: am
cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev
* commit '
8c7436558fa61b5ce9e82116b6b385f8f246d87e':
Revert "Dismiss color fade when it is no longer used."
Michael Lentine [Fri, 25 Sep 2015 00:40:39 +0000 (00:40 +0000)]
am
cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev
* commit '
cb13da9772b41c3466c3ed514e6321c2cfb85c2a':
Revert "Dismiss color fade when it is no longer used."
Michael Lentine [Fri, 25 Sep 2015 00:31:24 +0000 (00:31 +0000)]
Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev
Michael Lentine [Thu, 24 Sep 2015 23:58:46 +0000 (16:58 -0700)]
Revert "Dismiss color fade when it is no longer used."
Bug:
24371570
This reverts commit
193560002fbc080f0006df088f8f5e9c165bfd78.
Adrian Roos [Fri, 25 Sep 2015 00:14:55 +0000 (00:14 +0000)]
am
f73aab33: (-s ours) am
2ce4fb0c: am
a4150f49: am
f02ba4b8: am
09945c0b: am
fe7ceca1: (-s ours) am
9ceec2f0: am
f6c75158: am
12c54dfa: am
c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
* commit '
f73aab339ebfb9a05151bdf1dd632abe37becda4':
DO NOT MERGE Send next alarm's show intent via PendingIntent
Adrian Roos [Fri, 25 Sep 2015 00:08:22 +0000 (00:08 +0000)]
am
2ce4fb0c: am
a4150f49: am
f02ba4b8: am
09945c0b: am
fe7ceca1: (-s ours) am
9ceec2f0: am
f6c75158: am
12c54dfa: am
c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
* commit '
2ce4fb0c1f4824981f6ed03135bf513d98fb3153':
DO NOT MERGE Send next alarm's show intent via PendingIntent
Adrian Roos [Thu, 24 Sep 2015 23:59:45 +0000 (23:59 +0000)]
am
a4150f49: am
f02ba4b8: am
09945c0b: am
fe7ceca1: (-s ours) am
9ceec2f0: am
f6c75158: am
12c54dfa: am
c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
* commit '
a4150f49d031d431a7bdcc1cdedbffc4d3e312a5':
DO NOT MERGE Send next alarm's show intent via PendingIntent
Adrian Roos [Thu, 24 Sep 2015 23:50:09 +0000 (23:50 +0000)]
am
f02ba4b8: am
09945c0b: am
fe7ceca1: (-s ours) am
9ceec2f0: am
f6c75158: am
12c54dfa: am
c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
* commit '
f02ba4b8ffc44ccbb94ebcf1b70b77fc06af83d4':
DO NOT MERGE Send next alarm's show intent via PendingIntent
Adrian Roos [Thu, 24 Sep 2015 23:40:43 +0000 (23:40 +0000)]
am
09945c0b: am
fe7ceca1: (-s ours) am
9ceec2f0: am
f6c75158: am
12c54dfa: am
c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
* commit '
09945c0bdef5acf8276d433a96de3a5589b2de86':
DO NOT MERGE Send next alarm's show intent via PendingIntent
Jorim Jaggi [Wed, 23 Sep 2015 19:59:22 +0000 (12:59 -0700)]
Deliver camera launch source for analytics
Bug:
24304031
Change-Id: I606bccf4b62b651e17c6e6d9472648deeab703da
Adrian Roos [Thu, 24 Sep 2015 23:32:01 +0000 (23:32 +0000)]
am
fe7ceca1: (-s ours) am
9ceec2f0: am
f6c75158: am
12c54dfa: am
c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
* commit '
fe7ceca1acdbcde6449f57bb19b45f8c948cc1f5':
DO NOT MERGE Send next alarm's show intent via PendingIntent
Adrian Roos [Thu, 24 Sep 2015 23:25:48 +0000 (23:25 +0000)]
am
9ceec2f0: am
f6c75158: am
12c54dfa: am
c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
* commit '
9ceec2f0f007e05ed2842f222b4f652bdd69eb3f':
DO NOT MERGE Send next alarm's show intent via PendingIntent
Steve McKay [Thu, 24 Sep 2015 23:18:26 +0000 (23:18 +0000)]
Merge "Show empty roots except for content pickers."
Steve McKay [Wed, 23 Sep 2015 23:16:32 +0000 (16:16 -0700)]
Show empty roots except for content pickers.
Bug:
24140864
Change-Id: I9fae80a1e3d413e97ee099bee9c59f81f713cf27
Ben Kwa [Thu, 24 Sep 2015 23:13:42 +0000 (23:13 +0000)]
Merge "Fix a crash when deleting documents."
Adrian Roos [Thu, 24 Sep 2015 23:11:55 +0000 (23:11 +0000)]
am
f6c75158: am
12c54dfa: am
c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
* commit '
f6c7515817f9a4c24d2ff9baba2f916795862098':
DO NOT MERGE Send next alarm's show intent via PendingIntent
Wale Ogunwale [Thu, 24 Sep 2015 23:08:02 +0000 (23:08 +0000)]
Merge "Added am command to suppress config. changes during task resize."
Chong Zhang [Thu, 24 Sep 2015 23:03:12 +0000 (23:03 +0000)]
Merge "Use visible frame instead of task bounds for detecting resize start"
Ben Kwa [Thu, 24 Sep 2015 22:03:51 +0000 (15:03 -0700)]
Fix a crash when deleting documents.
Deleting (and moving) documents invalidates previous selections, as
items change position. Exit selection mode *before* actually deleting
anything, otherwise we end up trying to unselect potentially deleted
documents.
BUG=
24338150
Change-Id: I79fb0c156142b78987be68560c78306f2678c521
Adrian Roos [Thu, 24 Sep 2015 22:59:37 +0000 (22:59 +0000)]
am
12c54dfa: am
c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
* commit '
12c54dfa1219c5bb81482fe4bd4b164637f2e8b2':
DO NOT MERGE Send next alarm's show intent via PendingIntent
Winson Chung [Thu, 24 Sep 2015 22:58:39 +0000 (22:58 +0000)]
Merge "Removing unused debug overlay code."
Winson [Thu, 24 Sep 2015 22:51:40 +0000 (15:51 -0700)]
Removing unused debug overlay code.
Change-Id: I80d98b38001ca37bf5017b1631038fb574c324af
Wale Ogunwale [Thu, 24 Sep 2015 22:54:08 +0000 (15:54 -0700)]
Added am command to suppress config. changes during task resize.
This command is useful for testing during development, but at some
point we will decide if allowing configuration changes during resizing
is okay or merge in http://ag/759766 to suppress configuration changes
during resizing and deliver the new config. to the app.
This functionality will be reverted once we decide.
Bug:
24380097
Change-Id: I223c08bc939e564a78e70994b599770be9d4730d
Adrian Roos [Thu, 24 Sep 2015 22:49:19 +0000 (22:49 +0000)]
am
c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
* commit '
c9f7abe3705f7c74ad768e0a8e093f6f11e70e1c':
DO NOT MERGE Send next alarm's show intent via PendingIntent
Adrian Roos [Thu, 24 Sep 2015 22:39:23 +0000 (22:39 +0000)]
Merge "DO NOT MERGE Send next alarm's show intent via PendingIntent" into lmp-dev
Ben Kwa [Thu, 24 Sep 2015 22:28:08 +0000 (22:28 +0000)]
Merge "DocumentsUI: Add an error screen to DirectoryFragment."
Chong Zhang [Thu, 24 Sep 2015 19:32:21 +0000 (12:32 -0700)]
Use visible frame instead of task bounds for detecting resize start
Initial task bounds might be adjusted (for status bar, etc.). Touch
should be set up using visible frames instead of task bounds.
bug:
24336351
Change-Id: I944e3185a06c39b451432bdda5ad87880a0482f3
Zach Kuznia [Thu, 24 Sep 2015 22:14:09 +0000 (22:14 +0000)]
Merge "Use the standard GestureDetector for Double Taps in TouchExplorer"
Ben Kwa [Wed, 16 Sep 2015 20:15:38 +0000 (13:15 -0700)]
DocumentsUI: Add an error screen to DirectoryFragment.
- Reorganize the directory fragment.
- Repurpose the "empty" view to hold a message and a button.
- Message is set to the "No items" message if a directory is empty.
- Message is set to the error message if a query error occurs.
- Don't close DocumentsUI when a query error occurs.
Change-Id: I4e1e96f23040606b410ac746252dcb0ab9286f04
Todd Kennedy [Thu, 24 Sep 2015 21:56:34 +0000 (21:56 +0000)]
am
8f08db9d: am
4e321745: resolved conflicts for
cafacef6 to stage-aosp-master
* commit '
8f08db9def9b40075534facd20add5835cd3b5be':
Frameworks/base: Propagate boot status to installd
Todd Kennedy [Thu, 24 Sep 2015 21:48:50 +0000 (21:48 +0000)]
am
4e321745: resolved conflicts for
cafacef6 to stage-aosp-master
* commit '
4e321745173de1eb89343238fadfbcc7ba1a88f9':
Frameworks/base: Propagate boot status to installd
Zachary Kuznia [Thu, 24 Sep 2015 00:08:23 +0000 (17:08 -0700)]
Use the standard GestureDetector for Double Taps in TouchExplorer
b/
24339804
Change-Id: I96fa1287fa941178fb9970ceb34d95a3604e6815
Todd Kennedy [Thu, 24 Sep 2015 21:34:06 +0000 (14:34 -0700)]
resolved conflicts for
cafacef6 to stage-aosp-master
Change-Id: Id02e098a02aede327c5bc1a98aa177d8bf9ec5a9
Wale Ogunwale [Thu, 24 Sep 2015 20:47:31 +0000 (13:47 -0700)]
Batch ACTION_MOVE events to vsync boundries when resizing task
- Created helper class BatchedInputEventReceiver for batching
ACTION_MOVE events to vsync boundries.
- Switched TaskPositioner to use new helper class for input events
so we reduce the number of input events we process per vsync.
Bug:
24375616
Change-Id: I4ee27949b956784fb89d8f190497e4765522c9d3
Alan Viverette [Thu, 24 Sep 2015 21:07:14 +0000 (17:07 -0400)]
Various fixes for Material widget styles
- Body1 text appearance in Material-styled NumberPicker
- Non-inverse text color in colored bordered button disabled state
Bug:
24374092
Bug:
24267929
Change-Id: I576af6171fc64ab821b6455d3b825c9b05eec4a7
Oren Blasberg [Thu, 24 Sep 2015 20:59:44 +0000 (20:59 +0000)]
Merge "Cascading submenus: Fix a few small issues."
Oren Blasberg [Mon, 21 Sep 2015 21:09:26 +0000 (14:09 -0700)]
Cascading submenus: Fix a few small issues.
1. Open submenus now disappear instantly rather than fading out when
mouse hovers over a non-submenu item.
2. When a submenu is opened on hover, the item that was hovered now
will remain selected instead of being deselected.
3. Fix an issue where if the same chain of submenus was opened more
than once, the submenus could open in a different direction each
time. To fix, we keep track of the direction of opening along the way
and make sure to reset the preferred direction when a submenu is
closed.
Bug:
20127825
Change-Id: I99972cce4ddabe316c5148f1dd79a5d7b3e64b87
Todd Kennedy [Thu, 24 Sep 2015 20:35:09 +0000 (20:35 +0000)]
Merge "Frameworks/base: Propagate boot status to installd"
Andreas Gampe [Mon, 21 Sep 2015 20:20:07 +0000 (13:20 -0700)]
Frameworks/base: Propagate boot status to installd
Propagate the boot status explicitly to installd so that we do not
have to rely on dev.bootcomplete, which isn't meaningfully set
when the device needs the decryption screen on boot.
Bug:
23898216
(cherry picked from commit
06bb908b78e3c790d3db52fef9f2ab0a129e53cd)
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
Sean Young [Thu, 24 Sep 2015 19:10:26 +0000 (19:10 +0000)]
am
da2f549f: am
2d39bfd5: Merge "Properly expose methods that override a non-hidden method in a hidden superclass in the API files." into mnc-ub-dev
* commit '
da2f549f3b77ee5f04a6f726facb1a091d796054':
Properly expose methods that override a non-hidden method in a hidden superclass in the API files.
Sean Young [Thu, 24 Sep 2015 19:01:33 +0000 (19:01 +0000)]
am
2d39bfd5: Merge "Properly expose methods that override a non-hidden method in a hidden superclass in the API files." into mnc-ub-dev
* commit '
2d39bfd51fabee0396fa3107ff98065ef4832667':
Properly expose methods that override a non-hidden method in a hidden superclass in the API files.
Sean Young [Thu, 24 Sep 2015 18:55:50 +0000 (18:55 +0000)]
Merge "Properly expose methods that override a non-hidden method in a hidden superclass in the API files." into mnc-ub-dev
Jorim Jaggi [Thu, 24 Sep 2015 18:34:17 +0000 (18:34 +0000)]
Jeff Hao [Thu, 24 Sep 2015 18:29:39 +0000 (18:29 +0000)]
Merge "resolved conflicts for
f005d55f to master"
Makoto Onuki [Thu, 24 Sep 2015 18:28:45 +0000 (18:28 +0000)]
Merge "Test more DPM APIs."
Jeff Hao [Thu, 24 Sep 2015 18:26:48 +0000 (11:26 -0700)]
resolved conflicts for
f005d55f to master
Change-Id: I82027116a2b0bfc8b1ff1e20c3a115a1ba8a19db
Jorim Jaggi [Thu, 24 Sep 2015 18:20:57 +0000 (18:20 +0000)]
am
2d48a93f: am
98a8c7c5: am
e1de9f67: Fix black Keyguard
* commit '
2d48a93fea89cbdaae8e6cb718dbc382e35764df':
Fix black Keyguard
Jorim Jaggi [Thu, 24 Sep 2015 18:14:42 +0000 (18:14 +0000)]
am
98a8c7c5: am
e1de9f67: Fix black Keyguard
* commit '
98a8c7c553108e6d6f6260ae5c1f05d8a6c8af10':
Fix black Keyguard
Jorim Jaggi [Thu, 24 Sep 2015 18:08:07 +0000 (18:08 +0000)]
am
e1de9f67: Fix black Keyguard
* commit '
e1de9f674575df3b17e475c4f32dd93d33e596e3':
Fix black Keyguard
Jeff Hao [Thu, 24 Sep 2015 17:47:56 +0000 (17:47 +0000)]
am
75ab8c77: am
384d84f4: Merge "Shorten first boot time by filtering dexopted apps by LRU."
* commit '
75ab8c7789b4ec5e26bc7d2f773a6c39d39a821b':
Shorten first boot time by filtering dexopted apps by LRU.
Jorim Jaggi [Wed, 23 Sep 2015 21:59:50 +0000 (14:59 -0700)]
Fix black Keyguard
When a window has both the flag fullscreen and the dismiss Keyguard
flag, we end up in a state where we hide the status bar window but
all other windows, because mShowingLockscreen nevers gets set
correctly. Move it up so we always set it no matter whether the
status bar window was visible.
Bug:
22875357
Change-Id: I7953fe7100cc99fe8fb7424a9b311b4630426657
Blazej Magnowski [Thu, 24 Sep 2015 17:43:02 +0000 (17:43 +0000)]
Merge "added Classifiers and Evaluators"
Jeff Hao [Thu, 24 Sep 2015 17:39:34 +0000 (17:39 +0000)]
am
384d84f4: Merge "Shorten first boot time by filtering dexopted apps by LRU."
* commit '
384d84f4f02643b63335f6d8d884adc1186d6896':
Shorten first boot time by filtering dexopted apps by LRU.
Jeff Hao [Thu, 24 Sep 2015 17:30:25 +0000 (17:30 +0000)]
Merge "Shorten first boot time by filtering dexopted apps by LRU."
Jeff Hao [Wed, 23 Sep 2015 20:57:30 +0000 (13:57 -0700)]
Shorten first boot time by filtering dexopted apps by LRU.
No longer dexopt all system apps and boot listener user apps.
Bug:
23628238
Bug: https://code.google.com/p/android/issues/detail?id=186589
Change-Id: Ib4f960686afcfda13838f7783c2d3ccf8e26db72
Elliott Hughes [Thu, 24 Sep 2015 17:23:00 +0000 (17:23 +0000)]
am
ea1831d2: am
b57dd722: resolved conflicts for
a884d81e to stage-aosp-master
* commit '
ea1831d211ea0e6b2d161c714bb0786369ef2df5':
constify JNINativeMethod function pointer tables