drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
161,101 Commits 1 Branch 0 Tags
Commit Graph

161101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
20a46fb14f am 2ea3650d: Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev 
* commit '2ea3650d18ab0ce4dba2cee101d639400b411452':
  Zen: New behavior for built-in downtime + nextalarm conditions.
 2014-12-08 16:52:49 +00:00
John Spurlock
2ea3650d18 Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev 2014-12-08 16:47:28 +00:00
Geoff Mendal
fb293b9f9d am 9eb2092e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '9eb2092ea146faa21b8c6e0e512c03fc67a09dda':
  Import translations. DO NOT MERGE
 2014-12-08 16:45:32 +00:00
Geoff Mendal
9eb2092ea1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-08 16:40:55 +00:00
smain@google.com
8bd51aa52d am 983ba2ba: am 9a379e73: am 341c518f: am 43838855: fix migrate instruction step 
* commit '983ba2ba072860200423e77ebe159bb0d18af36c':
  fix migrate instruction step
 2014-12-08 16:38:19 +00:00
smain@google.com
983ba2ba07 am 9a379e73: am 341c518f: am 43838855: fix migrate instruction step 
* commit '9a379e73cb7deb3157fa20d83d848cfb9d5d87ff':
  fix migrate instruction step
 2014-12-08 16:31:34 +00:00
smain@google.com
9a379e73cb am 341c518f: am 43838855: fix migrate instruction step 
* commit '341c518f88411050a2dfa6b4283540acdc265c5e':
  fix migrate instruction step
 2014-12-08 16:24:46 +00:00
smain@google.com
341c518f88 am 43838855: fix migrate instruction step 
* commit '43838855754bb035c5fb06fe57ec2a089011b866':
  fix migrate instruction step
 2014-12-08 16:16:35 +00:00
smain@google.com
4383885575 fix migrate instruction step 
Change-Id: I28cf353f2b21d06ee256673590501487f8645b05
 2014-12-08 08:07:14 -08:00
Geoff Mendal
2119b65f83 Import translations. DO NOT MERGE 
Change-Id: Iafa118acf3037310f0b60425500b21a714103406
Auto-generated-cl: translation import
 2014-12-08 08:07:06 -08:00
John Spurlock
530052a2fe Zen: New behavior for built-in downtime + nextalarm conditions. 
- Downtime: Allow user to enter downtime early, offer as an end
   condition four hours before downtime starts.  Available in
   either none or priority, regardless of settings configuration.
 - Downtime: Always exit before next alarm if zen=none.
 - Downtime: Make more like any other condition provider, remove
   special status (mostly).
 - Downtime: New auto-triggering rules, allow triggering after a
   manual condition ends, once.
 - Decouple NextAlarm + Downtime providers, allow them to offer
   their conditions at the same time.
 - Downtime/NextAlarm: Update conditions if they change while being
   requested, even if unsubscribed.
 - Make all three built-in condition providers optional, via config.
 - New internal helper for runtime config.
 - Don't follow changes to next alarm, consider the condition false.
 - Isolate downtime calendar logic into separate class (for testing).
 - Allow a:bb -> a:bb as a valid downtime range (all day).
 - Volume dialog: configuration establishes maximum number of visible
   conditions, including built-ins.
 - Zen mode panel: avoid widget updates during layout transition.
 - Zen mode panel: move controller callers to background thread.
 - Zen mode panel: hide/show/rebind rows instead of adding/removing.
 - ZenLog: Add downtime autotrigger results.
 - Volume panel: Smarter refresh on ringer/zen changes.

Bug: 16373455

Change-Id: I4f801018ddb0beb6eb9fa03a81c79f7949888a3f
 2014-12-08 11:00:57 -05:00
Jinsuk Kim
33697d859f am 78a73577: Merge "CEC: Update CEC device info properly" into lmp-mr1-dev 
* commit '78a7357787406220c4c2459f8d25a0175ac98347':
  CEC: Update CEC device info properly
 2014-12-08 15:49:13 +00:00
Jinsuk Kim
78a7357787 Merge "CEC: Update CEC device info properly" into lmp-mr1-dev 2014-12-08 15:43:35 +00:00
Jinsuk Kim
6102bac706 CEC: Update CEC device info properly 
CEC device information cannot be updated/notified properly if
the device was plugged to other port. This change makes
sure the updated information is reflected by device event
callback listeners.

Bug: 18513567
Change-Id: I62bbb741d3f89e225a50f86e315da014832d8118
 2014-12-09 00:42:37 +09:00
Geoff Mendal
a551f6c860 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-08 15:10:57 +00:00
Geoff Mendal
b266393ecd am b9f245d4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'b9f245d4645e4f3ed47a2a587540505576b96524':
  Import translations. DO NOT MERGE
 2014-12-08 15:07:27 +00:00
Geoff Mendal
b9f245d464 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-08 15:02:17 +00:00
Geoff Mendal
eb95370308 Import translations. DO NOT MERGE 
Change-Id: I0c8df0ef538cc420817e53a5f6513329a50be46a
Auto-generated-cl: translation import
 2014-12-08 07:00:01 -08:00
Geoff Mendal
6c5836eca4 Import translations. DO NOT MERGE 
Change-Id: Ib0681b2f224456a803391c95f1283f41a06e58a7
Auto-generated-cl: translation import
 2014-12-08 06:53:32 -08:00
Jason Monk
15a8a1531e am 32eb928c: Merge "QS Wifi panel show icon on secure networks" into lmp-mr1-dev 
* commit '32eb928c29b5a9ab490f972dd9b52848c95a4709':
  QS Wifi panel show icon on secure networks
 2014-12-08 14:40:42 +00:00
Geoff Mendal
9c00c3d57f am 8510d014: (-s ours) Import translations. DO NOT MERGE 
* commit '8510d0142c888eb4b968ba1b07824b398efb1792':
  Import translations. DO NOT MERGE
 2014-12-08 14:40:37 +00:00
Jason Monk
32eb928c29 Merge "QS Wifi panel show icon on secure networks" into lmp-mr1-dev 2014-12-08 14:32:12 +00:00
Geoff Mendal
e734a86b69 Import translations. DO NOT MERGE 
Change-Id: Ifb7d25104a21beffd196b8d73d3c6c20e3800f9f
Auto-generated-cl: translation import
 2014-12-08 06:32:08 -08:00
Jason Monk
b27ec6d37d QS Wifi panel show icon on secure networks 
Bug: 18365695
Change-Id: Ib63822643a5b033d8b73591e9b379b3539b8865e
 2014-12-08 09:31:00 -05:00
Geoff Mendal
8510d0142c Import translations. DO NOT MERGE 
Change-Id: I50002c9d6b9e684be9f69dab0c8318226cbda6b9
Auto-generated-cl: translation import
 2014-12-08 06:28:24 -08:00
Zoltan Szatmary-Ban
f5e44c29e8 am c5c93edd: Merge "When switching to default USB function set, check restriction" into lmp-mr1-dev 
* commit 'c5c93edd9354e956d9b0a4d85fc8372907e2b011':
  When switching to default USB function set, check restriction
 2014-12-08 12:55:54 +00:00
Zoltan Szatmary-Ban
c5c93edd93 Merge "When switching to default USB function set, check restriction" into lmp-mr1-dev 2014-12-08 12:50:25 +00:00
Jinsuk Kim
0cc53a5bae am 15556bbb: Merge "CEC: Disable debug logging" into lmp-mr1-dev 
* commit '15556bbb4f873103f9bb911351389ee6c3295fea':
  CEC: Disable debug logging
 2014-12-08 11:09:00 +00:00
Jinsuk Kim
15556bbb4f Merge "CEC: Disable debug logging" into lmp-mr1-dev 2014-12-08 11:02:30 +00:00
smain@google.com
937cb812b6 am 01a7eeba: am d9babcf0: am 5939bd03: am 35ee3018: revisions to Studio landing page 
* commit '01a7eeba04b4468438804fac278c5045c200ab96':
  revisions to Studio landing page
 2014-12-08 10:33:16 +00:00
smain@google.com
195a0da457 am 229f8a3c: am e0245cb5: am 1f5b2510: am 2cfdbf5f: Merge "fix migrate guide and other studio edits cherryick from Ic223d8fa3cd1e66ddd37b8f896fef12869be4268" into lmp-docs 
* commit '229f8a3ca5ba517dad71bac63c29922c595fd901':
  fix migrate guide and other studio edits cherryick from  Ic223d8fa3cd1e66ddd37b8f896fef12869be4268
 2014-12-08 10:33:10 +00:00
Jinsuk Kim
8e609fa657 CEC: Disable debug logging 
Bug: 18471978
Change-Id: I2e229c5402d3d8f687414ec10f36f1d56505cdf9
 2014-12-08 19:30:23 +09:00
smain@google.com
01a7eeba04 am d9babcf0: am 5939bd03: am 35ee3018: revisions to Studio landing page 
* commit 'd9babcf03435305c59ad748a18162601c1d85761':
  revisions to Studio landing page
 2014-12-08 10:26:22 +00:00
smain@google.com
229f8a3ca5 am e0245cb5: am 1f5b2510: am 2cfdbf5f: Merge "fix migrate guide and other studio edits cherryick from Ic223d8fa3cd1e66ddd37b8f896fef12869be4268" into lmp-docs 
* commit 'e0245cb5fea4bd5e4749fb1e48b504bbe8eb7494':
  fix migrate guide and other studio edits cherryick from  Ic223d8fa3cd1e66ddd37b8f896fef12869be4268
 2014-12-08 10:26:18 +00:00
smain@google.com
d9babcf034 am 5939bd03: am 35ee3018: revisions to Studio landing page 
* commit '5939bd037f9c6495aec24c363390284d4ea141b6':
  revisions to Studio landing page
 2014-12-08 10:19:53 +00:00
smain@google.com
e0245cb5fe am 1f5b2510: am 2cfdbf5f: Merge "fix migrate guide and other studio edits cherryick from Ic223d8fa3cd1e66ddd37b8f896fef12869be4268" into lmp-docs 
* commit '1f5b251065eddeedc9c1ed1d9368d453596c7b50':
  fix migrate guide and other studio edits cherryick from  Ic223d8fa3cd1e66ddd37b8f896fef12869be4268
 2014-12-08 10:19:50 +00:00
smain@google.com
5939bd037f am 35ee3018: revisions to Studio landing page 
* commit '35ee301889acdc18ec154172e30401fee07138cd':
  revisions to Studio landing page
 2014-12-08 10:13:09 +00:00
smain@google.com
1f5b251065 am 2cfdbf5f: Merge "fix migrate guide and other studio edits cherryick from Ic223d8fa3cd1e66ddd37b8f896fef12869be4268" into lmp-docs 
* commit '2cfdbf5f7f087c1d214e51e6daf7193234cd19ee':
  fix migrate guide and other studio edits cherryick from  Ic223d8fa3cd1e66ddd37b8f896fef12869be4268
 2014-12-08 10:13:05 +00:00
smain@google.com
35ee301889 revisions to Studio landing page 
Change-Id: I608b8a63b826f2f2ee2603d7426b501a4df24a38
 2014-12-08 01:26:21 -08:00
smain@google.com
2cfdbf5f7f Merge "fix migrate guide and other studio edits cherryick from Ic223d8fa3cd1e66ddd37b8f896fef12869be4268" into lmp-docs 2014-12-08 09:21:56 +00:00
smain@google.com
c07d57d46d fix migrate guide and other studio edits 
cherryick from  Ic223d8fa3cd1e66ddd37b8f896fef12869be4268

Change-Id: Ic223d8fa3cd1e66ddd37b8f896fef12869be4268
 2014-12-08 01:20:22 -08:00
smain@google.com
befef081a8 am 2b4bd09c: am d9c08bac: am 895ab42f: am 59a3dd7b: misc fixes for studio launch: update install instructions, update tools nav for AVD page, update AVD instructions in first app class, other edits to first app. 
* commit '2b4bd09c5e839dd79460a159917a068e9150ecf2':
  misc fixes for studio launch: update install instructions, update tools nav for AVD page, update AVD instructions in first app class, other edits to first app.
 2014-12-08 09:04:54 +00:00
smain@google.com
2b4bd09c5e am d9c08bac: am 895ab42f: am 59a3dd7b: misc fixes for studio launch: update install instructions, update tools nav for AVD page, update AVD instructions in first app class, other edits to first app. 
* commit 'd9c08bac4bb37e8f1180e0e79a2b449568a895a9':
  misc fixes for studio launch: update install instructions, update tools nav for AVD page, update AVD instructions in first app class, other edits to first app.
 2014-12-08 08:57:43 +00:00
smain@google.com
d9c08bac4b am 895ab42f: am 59a3dd7b: misc fixes for studio launch: update install instructions, update tools nav for AVD page, update AVD instructions in first app class, other edits to first app. 
* commit '895ab42ffd3201584e0cb74d73ba10ee4fb59e13':
  misc fixes for studio launch: update install instructions, update tools nav for AVD page, update AVD instructions in first app class, other edits to first app.
 2014-12-08 08:51:43 +00:00
smain@google.com
895ab42ffd am 59a3dd7b: misc fixes for studio launch: update install instructions, update tools nav for AVD page, update AVD instructions in first app class, other edits to first app. 
* commit '59a3dd7b0e3a2ecab08d7dac39a44e2188cb8bc1':
  misc fixes for studio launch: update install instructions, update tools nav for AVD page, update AVD instructions in first app class, other edits to first app.
 2014-12-08 08:44:36 +00:00
smain@google.com
59a3dd7b0e misc fixes for studio launch: 
update install instructions, update tools nav for AVD page,
update AVD instructions in first app class, other edits to first app.

Change-Id: I086bf63dddc9f653ce06db29eec9998dfa265040
 2014-12-08 00:33:15 -08:00
Joe Fernandez
d816a98392 am c4bac980: am 44e7bcf4: am b6be2bff: am 40c4ccf4: Merge "doc: SDK install page fix and link fixes" into lmp-docs 
* commit 'c4bac980d0489ef53af961c7252494e9292f969b':
  doc: SDK install page fix and link fixes
 2014-12-08 07:28:17 +00:00
Joe Fernandez
c4bac980d0 am 44e7bcf4: am b6be2bff: am 40c4ccf4: Merge "doc: SDK install page fix and link fixes" into lmp-docs 
* commit '44e7bcf46aa8965e94a6427aa8128cbbd876cc02':
  doc: SDK install page fix and link fixes
 2014-12-08 07:22:01 +00:00
smain@google.com
42b65c6e89 am 4ec024e9: am 71319f28: am 160e7607: am dee9e37e: Merge "add studio 1.0 files and reorder features list" into lmp-docs 
* commit '4ec024e960f82963265fc2ec435a1b7b7f5581db':
  add studio 1.0 files and reorder features list
 2014-12-08 07:20:25 +00:00
Joe Fernandez
44e7bcf46a am b6be2bff: am 40c4ccf4: Merge "doc: SDK install page fix and link fixes" into lmp-docs 
* commit 'b6be2bff08394d0045e2bf540be1b4ba69e53354':
  doc: SDK install page fix and link fixes
 2014-12-08 07:14:44 +00:00