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

173399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
321e72461b am 301e1def: am 24328660: Merge "Check in "current" system API files." into lmp-mr1-dev 
* commit '301e1def7ab741830e1fbc02a291ff295a36c345':
  Check in "current" system API files.
 2015-01-22 20:47:22 +00:00
Ying Wang
301e1def7a am 24328660: Merge "Check in "current" system API files." into lmp-mr1-dev 
* commit '24328660c8f4f52647022fd0887978b74d607e06':
  Check in "current" system API files.
 2015-01-22 20:41:13 +00:00
Ying Wang
24328660c8 Merge "Check in "current" system API files." into lmp-mr1-dev 2015-01-22 20:36:06 +00:00
Ricardo Cervera
9331dcb962 am 0f400778: am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs automerge: 65ab86c automerge: 4386d85 
* commit '0f400778714f0357672651868146be73431d0b98':
  docs: Fixes to the watch faces design guidelines
 2015-01-22 18:39:26 +00:00
Ricardo Cervera
0f40077871 am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs automerge: 65ab86c 
automerge: 4386d85

* commit '4386d856a8ced336d08dd82395b52f30d0c122ae':
  docs: Fixes to the watch faces design guidelines
 2015-01-22 18:34:20 +00:00
Ricardo Cervera
4386d856a8 am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs 
automerge: 65ab86c

* commit '65ab86cf1ad414612ac57e14f581e0ffb1819e14':
  docs: Fixes to the watch faces design guidelines
 2015-01-22 18:27:57 +00:00
Jason Monk
e1e44ed73a Merge "QS: Fix second line in dual tiles" into lmp-mr1-dev automerge: 959ff1d 
automerge: 485ee97

* commit '485ee978306b4df3f2982a3fc692dcb48a8adb08':
  QS: Fix second line in dual tiles
 2015-01-22 18:04:57 +00:00
Ricardo Cervera
65ab86cf1a am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs 
* commit '02d093ca675535f1a7f702a9fffd277123cea8ca':
  docs: Fixes to the watch faces design guidelines
 2015-01-22 18:02:30 +00:00
Jason Monk
485ee97830 Merge "QS: Fix second line in dual tiles" into lmp-mr1-dev 
automerge: 959ff1d

* commit '959ff1d3a991b20140843187b2fb08c5a96c202b':
  QS: Fix second line in dual tiles
 2015-01-22 17:59:13 +00:00
Luan Nguyen
2bffc5e7bf am 2700393c: am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) automerge: 6117147 automerge: 563e767 
* commit '2700393c029baf9443622440f5ebad5073429075':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
 2015-01-22 17:57:01 +00:00
Ricardo Cervera
02d093ca67 am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs 
* commit 'bdfcd56e7f01b7bb1f50c932792b9528c67892e5':
  docs: Fixes to the watch faces design guidelines
 2015-01-22 17:56:54 +00:00
Ricardo Cervera
bdfcd56e7f Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs 2015-01-22 17:50:48 +00:00
Luan Nguyen
2700393c02 am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) automerge: 6117147 
automerge: 563e767

* commit '563e767a51357ed55c3fc53047fb9f94e4ef3c31':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
 2015-01-22 17:49:27 +00:00
Jason Monk
959ff1d3a9 Merge "QS: Fix second line in dual tiles" into lmp-mr1-dev 2015-01-22 17:49:06 +00:00
Ricardo Cervera
4bfde48739 docs: Fixes to the watch faces design guidelines 
Bug: 19001253

Change-Id: I356b887de71710afa27acc7544d0efdc3a857e91
 2015-01-22 09:46:43 -08:00
Luan Nguyen
563e767a51 am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) 
automerge: 6117147

* commit '61171477918ea55c70c706f062019f5cd2194043':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
 2015-01-22 17:44:45 +00:00
Luan Nguyen
6117147791 am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) 
* commit 'edb9ba54f7be81faacda4ee36824c6f8cd314fb3':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
 2015-01-22 17:35:31 +00:00
Luan Nguyen
edb9ba54f7 am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) 
* commit '1dd76ea2760f84496a5b82435fc35d7c28a6dd6d':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
 2015-01-22 17:29:30 +00:00
Luan Nguyen
1dd76ea276 docs: Fix companion configuration (18864041) 
Fix declaration of var and incorrect method call (18617393)

bug: 18864041
bug: 18617393
Change-Id: Ic31e44acfe7338f56acdbbd97ba8cc1e87042b53
 2015-01-22 08:15:57 -08:00
Jason Monk
6ece24e106 QS: Fix second line in dual tiles 
QSDualTileLabel is no longer a FrameLayout (now a LinearLayout),
so it does not need the top padding based on the caret size
anymore.

Bug: 18725348
Change-Id: Ibd3aaa20e7cdb35ba585cc5c8981c64efb5c66fe
 2015-01-22 10:40:54 -05:00
Jason Monk
4185030ad4 Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev automerge: 1a5ac5b 
automerge: 3c55689

* commit '3c556895edf01af562a16970ea3aecfd7dc51da7':
  Show connect dialog when selecting secure QS wifi
 2015-01-22 14:22:13 +00:00
Jason Monk
3c556895ed Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev 
automerge: 1a5ac5b

* commit '1a5ac5b415fea8098686aa08bffc6da3ada31938':
  Show connect dialog when selecting secure QS wifi
 2015-01-22 14:14:41 +00:00
Jason Monk
1a5ac5b415 Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev 2015-01-22 14:11:53 +00:00
Narayan Kamath
1194e754a9 Merge "Add support for persist.sys.locale." automerge: dca2332 
automerge: 117f161

* commit '117f161fee52dfa200f89282c487d58c29b41d4f':
  Add support for persist.sys.locale.
 2015-01-22 13:56:01 +00:00
Narayan Kamath
117f161fee Merge "Add support for persist.sys.locale." 
automerge: dca2332

* commit 'dca23321c6f5f0713e7910158f4c874812975077':
  Add support for persist.sys.locale.
 2015-01-22 13:52:19 +00:00
Narayan Kamath
dca23321c6 Merge "Add support for persist.sys.locale." 2015-01-22 13:49:43 +00:00
Narayan Kamath
d30dbb8ae1 Add support for persist.sys.locale. 
AndroidRuntime has been changed to read "ro.product.locale" and
"persist.sys.locale" instead of "ro.product.locale.language" etc.
This is passed down as "-Duser.locale" to the runtime.

The system_server has been changed to write out persist.sys.locale
on locale changes.

bug: 17691569

Change-Id: I93360c8795c9620a133656dc491d13d7b6ed162e
 2015-01-22 13:48:20 +00:00
Nicolas Prevot
2cb240e083 am 3677117d: Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev automerge: ad44f74 
* commit '3677117d2bc8b703ccad4eff5914a61508922dd6':
  Never set "Work" or "Personal apps" as prefered activities.
 2015-01-22 10:32:30 +00:00
Nicolas Prevot
3677117d2b Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev 
automerge: ad44f74

* commit 'ad44f7448f0b9aa672cad21300f436e369c8105d':
  Never set "Work" or "Personal apps" as prefered activities.
 2015-01-22 10:24:49 +00:00
Nicolas Prevot
ad44f7448f Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev 2015-01-22 10:22:08 +00:00
Erik Kline
61b07b4016 Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev automerge: 147cf4b 
automerge: 4f36150

* commit '4f3615036db441c4a099dc789ebcdf641ac5a987':
  Log interface name and uid when filtering a blocked network.
 2015-01-22 07:18:00 +00:00
Erik Kline
4f3615036d Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev 
automerge: 147cf4b

* commit '147cf4b8c4345f2d086251313583888356317d2d':
  Log interface name and uid when filtering a blocked network.
 2015-01-22 07:10:58 +00:00
Erik Kline
147cf4b8c4 Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev 2015-01-22 07:07:36 +00:00
Jim Miller
54dbd1fd43 am 0ac8dfa3: Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev automerge: ffd1a49 
* commit '0ac8dfa37bf089ade3760a8d703c6a79d98f5ca2':
  Clarify getTrustAgentConfiguration() documentation.
 2015-01-22 02:45:16 +00:00
Jim Miller
0ac8dfa37b Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev 
automerge: ffd1a49

* commit 'ffd1a49c0b8e442aea73c4f5336ea486492981f6':
  Clarify getTrustAgentConfiguration() documentation.
 2015-01-22 02:40:15 +00:00
Jim Miller
ffd1a49c0b Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev 2015-01-22 02:37:39 +00:00
Jinsuk Kim
8175e7b364 am c988e15e: Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev automerge: 7de1ed9 
* commit 'c988e15e1ff8e85981e7cd3347d759b37be1cf2f':
  CEC: Let playback device switch TV input after bootup
 2015-01-22 02:27:26 +00:00
Jinsuk Kim
c988e15e1f Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev 
automerge: 7de1ed9

* commit '7de1ed9d631ecabdf148e4e85bfc2f7f1698a77d':
  CEC: Let playback device switch TV input after bootup
 2015-01-22 02:21:59 +00:00
Jinsuk Kim
7de1ed9d63 Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev 2015-01-22 02:19:37 +00:00
Wonsik Kim
a80c07633b am 67add1d2: Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev automerge: 0313a0e 
* commit '67add1d26257eb298918a6e2c75f21afd59dadba':
  TIF: TvInputHardwareManager puts multiple sink ports into audio patch
 2015-01-22 02:02:39 +00:00
Wonsik Kim
67add1d262 Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev 
automerge: 0313a0e

* commit '0313a0e9b786f9d5d83113d574bcc8f27f2206dc':
  TIF: TvInputHardwareManager puts multiple sink ports into audio patch
 2015-01-22 01:54:49 +00:00
Wonsik Kim
0313a0e9b7 Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev 2015-01-22 01:52:08 +00:00
Miao Wang
118245d939 Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic." into lmp-mr1-dev automerge: dbfcf3f 
automerge: a710b83

* commit 'a710b839a23633bb049a6f91ccd7e17261e406a4':
  [Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic.
 2015-01-22 01:26:24 +00:00
Miao Wang
a710b839a2 Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic." into lmp-mr1-dev 
automerge: dbfcf3f

* commit 'dbfcf3f812c78d1e76c317b8f200488dcaea4d77':
  [Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic.
 2015-01-22 01:19:28 +00:00
Miao Wang
dbfcf3f812 Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic." into lmp-mr1-dev 2015-01-22 01:16:30 +00:00
Craig Mautner
f6ab9afc46 am d56352db: am c79a8ea0: Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev 
* commit 'd56352dbcb447ed0a93f2d46183e6217800add80':
  Resume home activity can skip resume and cause ANR. DO NOT MERGE
 2015-01-22 00:36:10 +00:00
Craig Mautner
d56352dbcb am c79a8ea0: Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev 
* commit 'c79a8ea0c4e1cb30c667f84276820f7e14bfb3b1':
  Resume home activity can skip resume and cause ANR. DO NOT MERGE
 2015-01-22 00:29:56 +00:00
Craig Mautner
c79a8ea0c4 Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev 2015-01-22 00:25:19 +00:00
Robert Greenwalt
ed25274e71 am ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev 
automerge: 9e7cb40

* commit '9e7cb40ddf055ecf1033555bd9ed90922a3cfa9b':
  Fix legacy request removal.
 2015-01-22 00:00:43 +00:00
Robert Greenwalt
8379688475 am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev 
automerge: 0343e1a

* commit '0343e1a7042e34589a52b4bf4a0afdcb2d51fc7d':
  Rerun entitlementcheck on sim change.
 2015-01-21 23:59:09 +00:00