Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
181,827 Commits 3 Branches 0 Tags
12271e22014c2e2cd0ecdb9938ff8b618c68bc56
Commit Graph

45483 Commits

Author SHA1 Message Date
Bryce Lee
a7e8717eb4 am 53b9fbd1: Expose userActivityTimeout through @SystemApi getter/setter. 
automerge: 2820911

* commit '28209111cc74e05fb6caa3d5b1756e57639247a4':
  Expose userActivityTimeout through @SystemApi getter/setter.
 2015-02-06 20:20:47 +00:00
Bryce Lee
28209111cc am 53b9fbd1: Expose userActivityTimeout through @SystemApi getter/setter. 
* commit '53b9fbd1610b6d3deb837dab34fd309d515f6385':
  Expose userActivityTimeout through @SystemApi getter/setter.
 2015-02-06 20:18:40 +00:00
Bryce Lee
53b9fbd161 Expose userActivityTimeout through @SystemApi getter/setter. 
This reverts commit 0dad572090.
System api documentation is not updated under PDK builds.

Change-Id: I851bcd66e0b764265e69ac104d5604bf316d5d10
 2015-02-06 12:06:34 -08:00
Bryce Lee
404a1327e9 am 13c70441: Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev 
automerge: a20e430

* commit 'a20e430d0ab8c65e392491b6d299a821c4bed50e':
  Revert "Expose userActivityTimeout through @SystemApi getter/setter."
 2015-02-06 19:45:54 +00:00
Bryce Lee
a20e430d0a am 13c70441: Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev 
* commit '13c7044186b90f7f63e7a17996222edfb18460f5':
  Revert "Expose userActivityTimeout through @SystemApi getter/setter."
 2015-02-06 19:42:38 +00:00
Bryce Lee
13c7044186 Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev 2015-02-06 19:35:43 +00:00
Bryce Lee
0dad572090 Revert "Expose userActivityTimeout through @SystemApi getter/setter." 
This reverts commit 40a0ee65f2.

Change-Id: Ida1a40db25643f97e82d517bcf147f23e4a3a0fe
 2015-02-06 19:35:33 +00:00
Bryce Lee
9cd324d158 am 4cccd58e: Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev 
automerge: 7b5f9cd

* commit '7b5f9cde6ac6d949d0227eb47aa2c5de4aea71d9':
  Expose userActivityTimeout through @SystemApi getter/setter.
 2015-02-06 19:11:36 +00:00
Bryce Lee
a5669730d0 am 4a88acfc: Merge "Make THEATER_MODE_ON a System API." into lmp-mr1-modular-dev 
* commit '4a88acfcc30544fa3424020b1c071d2954a47cb2':
  Make THEATER_MODE_ON a System API.
 2015-02-06 19:09:32 +00:00
Bryce Lee
7b5f9cde6a am 4cccd58e: Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev 
* commit '4cccd58e4219ff1e974db201e064c85063dd262f':
  Expose userActivityTimeout through @SystemApi getter/setter.
 2015-02-06 19:09:28 +00:00
Bryce Lee
4a88acfcc3 Merge "Make THEATER_MODE_ON a System API." into lmp-mr1-modular-dev 2015-02-06 19:05:45 +00:00
Bryce Lee
4cccd58e42 Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev 2015-02-06 19:05:22 +00:00
Scott Kennedy
a1c14fe945 Merge "Make setOn[Long]ClickListener() take a @Nullable argument" 2015-02-06 18:55:19 +00:00
Dianne Hackborn
28fbf95fc2 Merge "First quick implementation of auto assist data." 2015-02-06 18:45:05 +00:00
Dianne Hackborn
a7bb6fbeab First quick implementation of auto assist data. 
Introduce new AssistData class that contains all data
the framework automatically generates for assist.  Currently
populated with a very simple tree structure representing
the app's view hierarchy.

Reworked how we populate the class name for accessibility
info, so this is provided through a new method call on View
that subclasses can override.  This method is also used
to populate the class name in AssistData.

Change-Id: Ibd0acdc8354727d4291473283b5e4b70894905dc
 2015-02-06 10:42:44 -08:00
Neil Fuller
0b1b82473d am 022cf57f: am a08934cf: am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev 
automerge: c63efbd

* commit 'c63efbd928cc14e32fe19b2dec41d15ffc584182':
  Avoid static initialization of Layout from TextUtils
 2015-02-06 17:52:57 +00:00
Neil Fuller
c63efbd928 am 022cf57f: am a08934cf: am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev 
* commit '022cf57f82e40a103c4a48c083a59d7fa4936668':
  Avoid static initialization of Layout from TextUtils
 2015-02-06 17:51:05 +00:00
Neil Fuller
022cf57f82 am a08934cf: am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev 
* commit 'a08934cf54e3120d5019839a4b6d553b3364e8d1':
  Avoid static initialization of Layout from TextUtils
 2015-02-06 17:44:49 +00:00
Neil Fuller
a08934cf54 am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev 
* commit 'f789d45b24acc3745ccc97adb687502d488404f6':
  Avoid static initialization of Layout from TextUtils
 2015-02-06 17:37:32 +00:00
Neil Fuller
f789d45b24 Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev 2015-02-06 17:30:47 +00:00
Kenny Guy
d22517a708 am b6332fd2: am 70fb0ab4: am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev 
automerge: afca061

* commit 'afca06105c1344dade61ec5812bf605b11de0f1c':
  Fix mangled javadoc for setPermittedInputMethods.
 2015-02-06 16:44:42 +00:00
Kenny Guy
afca06105c am b6332fd2: am 70fb0ab4: am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev 
* commit 'b6332fd21a97b846015693684cee9e2af3381f0a':
  Fix mangled javadoc for setPermittedInputMethods.
 2015-02-06 16:37:11 +00:00
Kenny Guy
b6332fd21a am 70fb0ab4: am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev 
* commit '70fb0ab44e1b8d56f2cbe33d73afd3897c7584d1':
  Fix mangled javadoc for setPermittedInputMethods.
 2015-02-06 15:37:53 +00:00
Kenny Guy
70fb0ab44e am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev 
* commit '8debf21357477083a716275e2a32cb7169d42c47':
  Fix mangled javadoc for setPermittedInputMethods.
 2015-02-06 15:28:21 +00:00
Kenny Guy
8debf21357 Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev 2015-02-06 15:22:23 +00:00
Narayan Kamath
7869f4c9a3 Merge "Fix breakages in update-api." 2015-02-06 13:31:02 +00:00
Narayan Kamath
0d9ada9fdd Fix breakages in update-api. 
doc-comment-check was failing because a couple of javadoc comments
didn't fully qualify R.java's classname where required.

Change-Id: Id0445827e438fd4c1d6e4e9793a00a6cc9f59d3c
 2015-02-06 13:14:41 +00:00
Neil Fuller
d29bdb266d Avoid static initialization of Layout from TextUtils 
This works around a bug in standalone (e.g. non-Zygote)
runtimes when a device is attached to a host that is running
DDM.

There is a race condition:

When the runtime receives a HELLO from DDM it calls
TextUtils.isEmpty().

Calling any TextUtils methods statically initializes
Layout. Layout has dependencies on other classes, which in
turn have dependencies on native methods that are not always
registered when the call takes place. Registration and DDM
handling are done in separate threads.

This is not a fix, merely a workaround until the race can
be resolved.

Bug: 18081539
Change-Id: If1bd3de6597bc93da381c8f86dacf40156449561
 2015-02-06 10:29:54 +00:00
Scott Kennedy
e6ca429720 Make setOn[Long]ClickListener() take a @Nullable argument 
Change-Id: I923d1f986fa26cbf2a884c52af70469941daf8ea
 2015-02-05 21:03:42 -08:00
Bryce Lee
40a0ee65f2 Expose userActivityTimeout through @SystemApi getter/setter. 
This change will make it accessible to unbundled wear home.

Bug: 18721755
Change-Id: I0634dbc5d8d8ebe25e45af0a1b1186fda5254dd5
 2015-02-06 02:42:52 +00:00
Bryce Lee
e847b5baef Make THEATER_MODE_ON a System API. 
Bug: 19043538
Change-Id: Ibf0d6b45868ca90eb792a40c5d1b1395774486b8
(cherry picked from commit cdfebd60fa)
 2015-02-06 02:41:09 +00:00
Alan Viverette
b989c5561e resolve merge conflicts of da9653a to master. 
Change-Id: I7458452389fb7b048fe5c6daa375fd4dbb9d9766
 2015-02-05 17:10:47 -08:00
Alan Viverette
cbe32de454 am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev 
automerge: 80b381c

* commit '80b381c0736c1af43801b8ed26428abdf4d437b3':
  Mutate scroll bar drawables
 2015-02-06 00:53:09 +00:00
Alan Viverette
bbde12138c am 80b381c0: am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev 
* commit '80b381c0736c1af43801b8ed26428abdf4d437b3':
  Mutate scroll bar drawables
 2015-02-06 00:31:37 +00:00
Alan Viverette
80b381c073 am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev 
* commit '9a166c7da3d77c4b9801dbe249f78149649d5b0e':
  Mutate scroll bar drawables
 2015-02-06 00:25:33 +00:00
Alan Viverette
9a166c7da3 Merge "Mutate scroll bar drawables" into lmp-mr1-dev 2015-02-06 00:19:44 +00:00
Filip Gruszczynski
fe7712e758 am 7acd679c: Merge "Add wallpaper controlling system apis." into lmp-mr1-modular-dev 
automerge: 96f3462

* commit '96f3462958977a29aeb8acf102dd5e86c4a5417a':
  Add wallpaper controlling system apis.
 2015-02-06 00:16:41 +00:00
Filip Gruszczynski
3f579c7167 am 00de5c9f: Merge "Add hidden shutdown method to PowerManager." into lmp-mr1-modular-dev 
automerge: 943c09d

* commit '943c09d7204b15aadce041508972517763701cd3':
  Add hidden shutdown method to PowerManager.
 2015-02-06 00:15:12 +00:00
Filip Gruszczynski
96f3462958 am 7acd679c: Merge "Add wallpaper controlling system apis." into lmp-mr1-modular-dev 
* commit '7acd679cb3f3c543ad71aaeb1057bcbef3a880e5':
  Add wallpaper controlling system apis.
 2015-02-06 00:09:41 +00:00
Filip Gruszczynski
943c09d720 am 00de5c9f: Merge "Add hidden shutdown method to PowerManager." into lmp-mr1-modular-dev 
* commit '00de5c9f04e42045bd0299c06a9cc05187b1dff0':
  Add hidden shutdown method to PowerManager.
 2015-02-06 00:09:35 +00:00
Alan Viverette
f8512ce081 Mutate scroll bar drawables 
Bug: 19285726
Change-Id: I4bb596433c1fa1cc4e2fa53d0cdae992f9add858
 2015-02-05 15:58:56 -08:00
Filip Gruszczynski
7acd679cb3 Merge "Add wallpaper controlling system apis." into lmp-mr1-modular-dev 2015-02-05 23:19:01 +00:00
Filip Gruszczynski
00de5c9f04 Merge "Add hidden shutdown method to PowerManager." into lmp-mr1-modular-dev 2015-02-05 23:18:41 +00:00
John Spurlock
14a9f9cac7 am c46b68c7: am 9adf1c54: am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java. automerge: 29fabd8 
* commit 'c46b68c7a230847cd5a459d7fec5a5649f5c6d67':
  Fix a few typos in Parcel.java.
 2015-02-05 23:16:41 +00:00
Ruben Brunk
7bf20e4791 am 78ee9807: am cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev automerge: 2a11473 
* commit '78ee9807387e87714c74e6944d538409e0677b74':
  camera2: Make legacy error handling more robust.
 2015-02-05 23:16:36 +00:00
Adam Lesinski
9a647096ac am 88c5abb3: am 967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev automerge: abc88d0 
* commit '88c5abb33f0e306a8add10fcef90733aa205799e':
  Make ArrayMap.EMPTY immutable
 2015-02-05 23:16:31 +00:00
John Spurlock
c46b68c7a2 am 9adf1c54: am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java. 
automerge: 29fabd8

* commit '29fabd8988b95e5ff41167a74dfc67937988b3db':
  Fix a few typos in Parcel.java.
 2015-02-05 23:08:51 +00:00
Ruben Brunk
78ee980738 am cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev 
automerge: 2a11473

* commit '2a114737c636e69a65478778c6edb24c2266518e':
  camera2: Make legacy error handling more robust.
 2015-02-05 23:07:13 +00:00
Adam Lesinski
88c5abb33f am 967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev 
automerge: abc88d0

* commit 'abc88d0743924441bf7fcd3085e3305b076f5af5':
  Make ArrayMap.EMPTY immutable
 2015-02-05 23:05:40 +00:00
John Spurlock
29fabd8988 am 9adf1c54: am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java. 
* commit '9adf1c54226940e9f9065d92b4edd2b232122302':
  Fix a few typos in Parcel.java.
 2015-02-05 20:47:23 +00:00